projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
084b356
)
scrolledwindow: Avoid critical when removing source
author
Timm Bäder
<mail@baedert.org>
Wed, 10 May 2017 08:55:50 +0000
(10:55 +0200)
committer
Carlos Garnacho
<carlosg@gnome.org>
Thu, 25 May 2017 14:25:59 +0000
(16:25 +0200)
Make sure indicator->conceil_timer is actually set before trying to
remove it.
gtk/gtkscrolledwindow.c
patch
|
blob
|
history
diff --git
a/gtk/gtkscrolledwindow.c
b/gtk/gtkscrolledwindow.c
index 2eef2bf89866e68825e33cee309705156fba7ce0..634e7f2d06e5a11e28d67ef065f331d58fc828d1 100644
(file)
--- a/
gtk/gtkscrolledwindow.c
+++ b/
gtk/gtkscrolledwindow.c
@@
-3810,7
+3810,8
@@
indicator_set_fade (Indicator *indicator,
{
indicator->conceil_timer = g_timeout_add (INDICATOR_FADE_OUT_TIME, maybe_hide_indicator, indicator);
}
- if (!visible && gtk_widget_get_mapped (indicator->scrollbar))
+ if (!visible && gtk_widget_get_mapped (indicator->scrollbar) &&
+ indicator->conceil_timer != 0)
{
g_source_remove (indicator->conceil_timer);
indicator->conceil_timer = 0;